x86: allow SRAT to be used on 32-bit systems with memory beyond 4G

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 452f6534ebdaa0f6ca7d994db56498ecc865f56a..9da11f7b0ece3add3884f38a8c84ac28c3bb0bd5 100644 (file)
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -59,7 +59,7 @@ __devinit int setup_node(int pxm)
        return pxm2node[pxm];
 }
 
-int valid_numa_range(unsigned long start, unsigned long end, int node)
+int valid_numa_range(u64 start, u64 end, int node)
 {
        int i;
 
@@ -74,7 +74,7 @@ int valid_numa_range(unsigned long start, unsigned long end, int node)
        return 0;
 }
 
-static __init int conflicting_memblks(unsigned long start, unsigned long end)
+static __init int conflicting_memblks(u64 start, u64 end)
 {
        int i;
 

diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h
index 7e39b849d836fb8067fc5bcc181e0d9b712d670b..96155a6987bada3bbd15257349b9da4e389818d8 100644 (file)
--- a/xen/include/asm-x86/numa.h
+++ b/xen/include/asm-x86/numa.h
@@ -76,11 +76,11 @@ static inline __attribute__((pure)) int phys_to_nid(paddr_t addr)
 #define node_end_pfn(nid)       (NODE_DATA(nid)->node_start_pfn + \
                                 NODE_DATA(nid)->node_spanned_pages)
 
-extern int valid_numa_range(unsigned long start, unsigned long end, int node);
+extern int valid_numa_range(u64 start, u64 end, int node);
 #else
 #define init_cpu_to_node() do {} while (0)
 #define clear_node_cpumask(cpu) do {} while (0)
-#define valid_numa_range(start, end, node) {return 1;}
+#define valid_numa_range(start, end, node) 1
 #endif
 
 void srat_parse_regions(u64 addr);